projects
/
gpsbabel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8cd0492
7d094db
)
Merge pull request #144 from gpsbabel/fix_bad_merge
author
Robert Lipe
<robertlipe@users.noreply.github.com>
Sun, 15 Apr 2018 07:41:32 +0000
(
02:41
-0500)
committer
GitHub
<noreply@github.com>
Sun, 15 Apr 2018 07:41:32 +0000
(
02:41
-0500)
Loosen coupling of upgrade queries to OS version by using newer (2014) Qt services.
1
2
gui/app.pro
patch
|
diff1
|
diff2
|
blob
|
history
shape.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gui/app.pro
Simple merge
diff --cc
shape.cc
Simple merge